Minor enhancements on rake tasks