Fixed minor issues with empty strings