Plugged a few holes