Clean up warnings in Starter