(QNX BB10) Some more changes