fixing return types for O900