Fixed stuff pointed out by Ncla