Blueprint fixes