Second commit. More fixes.