Various bugs fixed

2008-06-30, lbessard