Allow use of trial subclasses on servers. Other improvements.