first round of locomo fixes

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>