Added more rules from NTFuture warnings