Fixes during stage testing