Cakefile bugfixes.