Fixed stuff from comments