Finishing rake file changes