Fix some of the issues. Still not working.