build_id fixes (thanks @mattbasta)