Fix some more phone issues