Fix Suspension commands and clean up