Second stab at master compat