branches/fault: removed old macro
branches/fault: fixed compilation issues