* Fix some things