Fixes some small issues