Fix for first primary key and removing broken imports