Some compatibility tweaks for older projects