Some minor changes from Thrive project

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>