Some fixes for summer practice