fixed compiler errors on DEV