Properly register a few missing classes

Change-Id: I5e6a9dfce53c20907b402a8bfabb688de6c747cc