Fixed adapters and comments