[Execute] Little fixes