Fix some ommissions