Added last minute fixes