building fixes