Misc. fixes from playthrough