Fixes for legislation