Dumb fixes
fixed interface