Fix some "other" bugs