solve minor issues