Some bug fixes (meeting)