Sprint fixes