Fix sources to remove errors and activation