Fixed up a few missing things