Minor improvements

thanks fixed