Few fixes at adpl