Fixed some remaining issues