Steve - Some mobile and heart fix for non-logged-in