Optimized draw calls also fixes for SWS