Fix some remaining issues