Smapp bugfixes