Readded some fixes.