WGLC 09 - Fix issues from previous updates