* Fix build errors