Minor tweaks for compatibility