Final changes and fixes