Fix safety warnings