Minor maintenance.rake changes