Even more cube fixes