Amended translator fixes for testing