Fixes for Rakefile and dist task