Some infra and rake changes