Fixes for publication...