Fixing up init and resolve.