Some missing fixes