Fixes for prepare command