Alpha testing fixes from creator