Small changes and fixes