Start of fix for mouse position being wrong