Utopia fixes.
by rowtree
Merge pull request #2622 from Spamcat/master

NRA Utopia