Dev last minute lang fixes