Fixed even more compiler errors