Bug fixes, SRS 345 refactoring