Fixes for previous commit ;0