Bug fixes for the latest cut