Fixing up init