Minor fixes - Enable hops