Feature/harden compatibility options