Adding fixes for the latest L5 updates