Misc bug fixes
b8/Form work