Fixed some Const getInt getAddr TODO's