Misc. small corrections