Small cleanups
Fixed translation bug