Statically linked libraries and other minor structure changes