Fixes for previous commit