Pocket mode fixes