Resolve Forms Issues