Last fixes Part 2