Darren Salt - 2006-01-26

Fix type-conversion error and some warnings