Make manipulation commands more robust