Fixes for hashcode improvement