AC class methods lock-decoration, misc minor changes