Changed constants from uints to ints.
Added missing constants prepending.