Many FB2 fixes