Bug fixes, availability util, icons and more