Added an extra post-init block to handle a few circular dependency issues