fixes for internal debate