Some little changes and fixes