Outside attacking bug fixes