Fixes for publication