fixes with locals and new hashes