Some synatactical fixes before milestone 2