Fixes for ISsue #450