Medium bp fixes

Signed-off-by: Christopher Hallahan <challahan@gmail.com>