more system service fixes