Fix minor driawing issues