fixes for demers