Partial handling tweaks