[PATCH] execute-in-place fixes