Fix some minor stuff