Fixed boostrap tasks