Fix issues Scrutinizer says that I introduced