Fixes a few minor issues