GenericBoard fixes