woops.. :)
Minor compile bug-fixes.
Merge remote-tracking branch 'origin/general' into ms1-integration