Minor fixes to make stuff work.