Fix build errors after merging develop