Last minute fixing.

Some last minute stuff that was found and still needed to be fixed.