Fixes after testing in real app