some fixes after UW