Corrected 4.1 stuff

Somehow managed to merge 4.1 into master. Too lazy to undo the merge properly