After fresh installation test bug fixes