One fix and one update