Fixed Timmer issues