Fix small issues with temporary taking