Small bug fixes with king and phase resetting