Fixes for Repeaters & CSS