Cakefile improvements