LayerCalculator fixes