Some fb2k fixes