Fixed Rakefile prob
More fixes