Final fixes for Monday