Fix bugs with hash controls