Fixes some forms issues relating to unserializing [#897]