Some more changes for Hexakill