Populate cleanup and fixes

Signed-off-by: Sean Wesenberg <wookets@gmail.com>