small fixes after testing in iOS