Fixes in lego train macros