Fixed build errors introduced by merging