Minor hotfix bugs