A couple more fixes for === instead of ==