Keywords and translation fixes