Misc. corrections