Deform Activity Bug fixes