Fixed few bugs in software block