couple of quick fixes for previous commit