Fixed some nasty showstoppers that appeared.