Some small adjustments!