Draw fixes