Hermaid Fixes