Minor code cleaning. Enabled multitask compilation