Fix rendering issues