Stagingfixes

Fix some null reference issues in staging.