Merged f02d97 and 55a9a, mostly syscheck stuff