More Lambda Fixes