Bug fixes for voyager code compliance