Lab Session Bug Fixes