Update decoration after file renaming.
Add compiler ordering macros. For stopping master task use a stop flag instaed of the cancel call again.