Fixes for HECTOR