Fixed issues with merge errors from henk