Bugfix CAMBuffer and CAMUnit