Final changes for 1.6.4

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>