Fix #1462

Added a bunch of is_objects and fixed exporting