Fix partial functions