Cleanup
Make R16 compatible