Fixes for automatic push