Fixes for missing tag information