Fix apply context/args