Some changes reflecting latest update

Signed-off-by: slushpuppy <geemail.duh@gmail.com>