WIP: Fix/encrypt compat