Even more fixes I found while testing!