Compatibility hotfixes for previous commit