Locking this thread as now resolved.