More backtick fixes