Fix some more derping