fix function return types