Little tweaks, re-adding new support because deprecation is annoying.