minore fixes due to new structure/naming