Clean up warnings in Starter again