Fixes for Fx18+