Final fixes for int to address conversion error #78