Resolved a few lingering issues caused be previous pushes refactor