Fixing software issues