Some graphics improvements