small bugs fix