branches/fault: fixed compilation issues