Before Sprint fixes