locks and constructor/init fixes