Fix some known problems