Fixed remaining issues from conversion. This appears to be equivalent to the original features now.