Sona bugfixes