Fixes for Rendering Issue