Fixes from Pull Req