Fixed issues with canceling features.