More hacking for compat layer work

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>