Pull request 51 quickfixes