Fixed rake tasks and storage issues