Latest fixes for improvements