More clipping/nodraw and so on issues fixed