Fix some minor issues