Misc fix.