Early changes for 1.6 compatibility, still WIP