warnings and ui fix