Minor fixes

'till working on SMS & DB implementations