More Cakefile bugfixes.