Fixes to Rakefile