Trivial bugfix and deprecation. thatnerd2: please fix