fix for some minor issues