Some more changes on swirl instructions