updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>