Multiple fixes for Sample submission