Fixed picky language stuff