Fixing the problems Erik found on review