Small Fixes to the hw