rboucher fix small bugs

Users who have contributed to this file

• rboucher