Add moar agressive warnings and fix an error