Subtle fixes