Fix known problems