Issue 169 and 298

Updates for issue 169 and 298