Fixes for first deployment