This fixes some issues that left over premature merging of polish branch.
polish
Also fixed another issue somebody mentioned in chat real quick.