fixes after testing uiv3