More fixes

last minute fixes....