Fix bugs with credits