Fix all outstanding issues