Fix some last issues