More push prep changes