Fixes from Motion-Twin