Some small changes and updates