Speeding up compat layer