Fix some expressions not working in custom stuff