Fixes some actions flow