fix stage 2 issues