Adding fixes for the latest L5 updates

This should fix a bunch of problems associated with the latest L5 framework updates.