Master cancellation and minor fixes