Added Lukas Proposed Fixes