Various code checks, reviews