Tweaks to rakefile