Some rakefile fixes, published issue 2