Method visibility and compatibility fixes