Yet some more small bugs