small fixes
master fixes