fixed push/pull declarations