Fixes for Cloudscaling Bootcamp