various minor fix