Fixed introduced compile errors and intellij warnings.
Fixed introduced compile errors and intellij warnings. Ifdeftoif parser needs to be looked at.
Merge branch 'master' into timing