Misc fix agin