Fixed compile issues due to merge