More bug fixes related to 0