initial fixes
initial fixes