Fixes for Mark