Several hamzilla-related fixes