Fixes for https://podio.com/bacondeczarcom/jack-jones-core/apps/development-tasks/items/1