Fixed software block bugs