Added small fixes for 3rd project review