Some rake changes