Switch to less compiler, fix minor bugs