Issue 492 Fixes after code review