Fix build errrors