Updates as per Brandon's requests

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>