Misc fix

same