Simplifications of some table's primary keys, and NetBeans 8.0 migration.