- Fix various minor bugs
