Some fixes I made.