[Uploaded] Fixes
Merges #668