Bug fixes and rake task.