More bug fixes
More bug fixes

Signed-off-by: Puneet Gupta <e1c8d7244450b09bbd8555955bfec9d157f9ffc7@gmail.com>

shuttlesworthNEO/HashHacks2.0-methOD,papajijaat/HashHacks2.0-methOD,shuttlesworthNEO/HashHacks2.0-methOD,papajijaat/HashHacks2.0-methOD