Fixed issues with zero return types