Fixed two issues in app buildstep hook