Work the kinks out