Forgot to update a couple of macros