Fixes some minor problems