Misc updates for Arudino