Some fixes related to namespaced form changes