Add suggested subdir-objects and other minor fixes