Fixes for the Cirros cloud image