Minor Fixes for V3

These are some minor fixes that shouldn't affect any current functionality.