Fixes, wait till next restart