Pull request fixes