Fix some errors in jonas' pull requests