Cleared out a few issues that Calclavia's changes caused