fixes for internal systems