lbi: various fixes
lib: fix move resolution