Fix subject issues