Restore variables a bit more specific