Adapter + Main fixes