Fixed: some interface issues