Fixes for Gil's identified issues