A few proposed changes for OvercastNetwork/Issues#45