Cleaned up some leftover warnings and TODOs.