Fix some bugs. Include before changes for better context