hub and thumbs fixes