Small fixed to function cases