Minor fixes for other tasks