fixed build and small corrections