Random changes and fixes