Fixed conditional compilation issues. Now compiles on vivace1.