Changes for compatibility to v6 beta11