Fixes by HJ