Minor changes to allow preview to build.. And readability