[FIX] ruc: Custom fixes