Fixed some Timer problems