Fixed errors reported from Dinesh for button variable monitoring