Various minor fixes

Add `@Deprecated` annotation here?