Fixes some issues with what I pushed before.