Fix some more small bugs