Fix some lightbugs