Fixes for wrapping lab.

Some minor fixes and clarifications