Cleaning up bugs from last commit