Fix for several veewee setup problems