Other cast fixes