F: Fixes for registration and additional track processing