Fixing cakefile bugs