Fixes for fb

Signed-off-by: Patrick Conroy <patrick@patrickconroy.com>