UTs and fixes