p012 Fixes