More updates to include BlueLine-specific changes so that we can still build now, while we work on merging into MG-SDL2 better.