Fixes for older releases (0)