compat controller + some fixes