Fixed a bunch of collision layer errors