Last minute fixes part II