Some legislation updates and fixes

See commits titles for more details.