- misc fixes