A few updates to BBWrapView