Fixes some minor issues