hammer and stellar fixes for mobile