Small bug fixes and infinite commit lines