Method visibility and order fixes