Couple more Cakefile issues