* Misc fix