Small Fixes before UPLOAD