Fix up things that might break later on. Make our code indestrutable