Fix some previous issues