Fixed some routines