Many fixes for simple tasks