small fixes / cleanup