Minor mockups fixes
Hashspace phase 1 - first drop