Finished triggers and fix tables