Credits fixes