Fix some key issues, defer others by commenting out.