Changes for compatibility and avoidance on errors