Fixes and cleanups.
Merge pull request #36 from pchote/pr-2952

Cursor palette cleanup fixes