Fixes for hack-minar