Bug Fixes for Events Command and Skip Command