Misc bug fixes to fix issues seen on board
Added Fgyrus