Clean up audio player; fix some null references