Fixing more underscores