no-extensions fixes