A few more minor cusotmizations