init: suspend: clean up/fixes