Tried some fixes.