Some fixes for milestone 1

Please accept this request