Smaller fixes to help