Real-time support, fixes