Some fixes for new move lib, more to come