Fixing strict validation bugs