Ready #KV-1 fixes