minor fixes

WIP :).