Stage 2 fixes